Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOCS] Merge 'main' into 'oss-docs' - after DCO check was added #349

Merged
merged 82 commits into from
Mar 18, 2021

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented Mar 17, 2021

Issue #, if available:
#142

Description of changes:

The PR requests merging the code into oss-docs branch.

Besides changes related to documents, oss-docs branch will be synchronized with main branch until the commit b0f137e

Testing:
./gradlew :docs:check passed.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

nknize and others added 30 commits March 13, 2021 10:36
Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes the doc directory

Signed-off-by: Peter Nied <petern@amazon.com>
Co-authored-by: Huan Jiang <huanji@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of EQL from the sanitized fork.

Signed-off-by: Peter Nied <petern@amazon.com>
…later (#10) (#6)

Co-authored-by: Huan Jiang <huanji@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
…check fails (#7)

Signed-off-by: Peter Nied <petern@amazon.com>
* Cleanup build-scan, remove publish scan to elastic server

* Cleanup build script to exclude security-authorization-engine which test has dependency on xpack

* Cleanup build script to exclude security-authorization-engine which test has dependency on xpack

Co-authored-by: Huan Jiang <huanji@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of the Elastic licensed enrichment processor.

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed asyc-search

Signed-off-by: Peter Nied <petern@amazon.com>
This committ removes all trace of Elastic licensed CCR.

Signed-off-by: Peter Nied <petern@amazon.com>
…license REST APIs. (#12)

Co-authored-by: Rabi Panda <rabipanda@icloud.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed graph feature

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of x-pack ml.

Signed-off-by: Peter Nied <petern@amazon.com>
This commits adds InferenceConfig back to org.elasticsearch.client.analytics for use in InferencePipelineAggregationBuilder.

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of the security high level rest client and other reference to x-pack security

Co-authored-by: Rabi Panda <rabipanda@icloud.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed rollups

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed SQL

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed Migration

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed ILM.

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed watcher

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed monitoring

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
…(#59593)" (#28)

This commit reverts commit 2a89e13e43d62ec9c443bfaba42c9a1da7e81223. Relicensing data streams from OSS to XPack.

Signed-off-by: Peter Nied <petern@amazon.com>
This commit removes all trace of Elastic licensed transforms.

Signed-off-by: Peter Nied <petern@amazon.com>
This fixes the constructor for IndexNameExpressionResolver to pass in
Settings.EMPTY to a ThreadContext used by the resolver.

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Some of the tests that use the x-pack code are failing compilation. This PR cleans up the references to fix the issue.

Signed-off-by: Peter Nied <petern@amazon.com>
This commit cleans up the following:

* Remove unused imports
* Remove ILM settings in hlrc testCluster formation
* Comment out security users settings in ElasticsearchNode creation for build-tools tests

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
* fix testProvidedNamedXContents by modifying the assertion

Signed-off-by: Peter Nied <petern@amazon.com>
abbashus and others added 23 commits March 13, 2021 10:36
…oved (#85)

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This currently unblocks the gradle check and subsequently will be removed by the meta issue opensearch-project/OpenSearch#50

Signed-off-by: Peter Nied <petern@amazon.com>
Plugins CLI - disable installing official plugins by name.

Currently the plugin cli allows installation of a plugin by name in which case it downloads the plugin artifacts from the official elastic artifacts repository.

We will enable it once we have the new official artifacts download URL (Tracking Issue: #100)

Signed-off-by: Peter Nied <petern@amazon.com>
Adding jenkinsfile to describe the build / test / deployment process for this repository

Signed-off-by: Peter Nied <petern@amazon.com>
This commit changes the building, packaging, and testing framework to only support OSS on different distributions.

Next steps:

completely remove -oss flag dependencies in package and build tests
move 6.x bwc testing to be an explicit option
remove any references to elastic.co download site (or replace with downloads from the OSS website)

Co-authored-by: Himanshu Setia <setiah@amazon.com>
Co-authored-by: Rabi Panda <pandarab@amazon.com>
Co-authored-by: Himanshu Setia <58999915+setiah@users.noreply.github.com>
Co-authored-by: Sarat Vemulapalli <vemsarat@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Harold Wang <harowang@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
* Update CI workflow to work on new infra

- Backward compatability tests are disabled during CI by default #113
- Added property to allow for disabling bwc tests
- Added agent label to use specific hardware https://www.jenkins.io/doc/book/pipeline/syntax/#agent

Signed-off-by: Peter Nied <petern@amazon.com>
As part of this PR, we are disabling the BWC checks. Once we have finalized the versions for the fork, we can re-enable it with right configurations.

Relates #105

Signed-off-by: Rabi Panda <pandarab@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Explicitly adding code of conduct from https://opendistro.github.io/for-elasticsearch/codeofconduct.html

Signed-off-by: Peter Nied <petern@amazon.com>
* Add script to perform signoff check between commits

Signed-off-by: Peter Nied <petern@amazon.com>
This commit refactors all instances of elasticsearch in
server/src/main/java/org/apache to opensearch.

Signed-off-by: Nicholas Knize <nknize@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This reverts commit c50e8c83a2476ca4ca2f1dd05fa5a608bc0e9ef6
which went should have merged to the rename branch instead of
the main branch.

Signed-off-by: Peter Nied <petern@amazon.com>
replaced renameme

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Sarat Vemulapalli <vemsarat@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
updating to Apache 2.0 License from https://www.apache.org/licenses/LICENSE-2.0.txt

Signed-off-by: Peter Nied <petern@amazon.com>
This commit updates the NOTICE.txt file to include the OpenSearch copyright
notice.

Signed-off-by: Nicholas Knize <nknize@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This commit fixes the url reference to bwc disabled message.

Signed-off-by: Kyle Davis <kyledvs@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng added the documentation Improvements or additions to documentation label Mar 17, 2021
@tlfeng tlfeng requested a review from setiah March 17, 2021 05:54
@tlfeng tlfeng added the >FORK Related to the fork process label Mar 17, 2021
@odfe-release-bot
Copy link

✅   DCO Check Passed

@setiah setiah merged commit 1c4b922 into opensearch-project:oss-docs Mar 18, 2021
@tlfeng tlfeng deleted the merge-main-2 branch March 18, 2021 04:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation >FORK Related to the fork process
Projects
None yet
Development

Successfully merging this pull request may close these issues.